bitkeeper revision 1.1159.170.57 (41b4b344W3zPVx6PTLPQLdqX4FCv_w)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Mon, 6 Dec 2004 19:30:12 +0000 (19:30 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Mon, 6 Dec 2004 19:30:12 +0000 (19:30 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xen-2.6.10-rc2.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen-2.0-linux.bk


Trivial merge